misc changes/cleanup/ bug fixes
drwxr-xr-x - ti