some misc fixes, cleanup
drwxr-xr-x - ti