fixes and cleans