Ungodly amounts of fixes, cleans and added functionality. Damn you commit message forcing me to feel bad for bad commit messages