all kinds of fixes
tons of cleaning and fixing