Fixes and cleaning