cleanups and fixes

fixes #29 
fixes #28