#40 cleanups to merge master into dev