fixes and cleaning