Various adjustments. I should commit more often ;).
drwxr-xr-x - calibcant