Final Fixes

Fixed most things :D