fixes and clean