Fixes and clean