Some general cleanup
Bugfix
Redo manifest
Small cleanup