Well lots and lots and lots of fixes.
Some test things so dont press 'r'
Be warned :P