all kinds of fixes
tons of cleaning and fixing
Merge pull request #385 from way2muchnoise/1.7-update

Fixes and Cleans