various clean up, check the git diff .... bleh