General Updates and code clean, credit to Tjstretchalot for help
-PreAlpha