Trying to fix most of the errors tterrag made