Big Cleanup #1

Open
g33kex wants to merge 19 commits from big_cleanup into master