Bugfix
Fixes and missing files