fix most issues
Merge branch 'master' of https://github.com/trevynmeyer/watts-clean