Bug Fixes / Spring Cleaning

Removed .ds_store
mainly administrative fixes, see commits for details