misc
basically working
Merge branch 'master' into dev
Removed dead code and added more docs