assorted changes/cleanup

Done for the night, next step is to move images out of documents
directory and into a . directory to avoid clutter