Fixes some things. Massive thanks to Mitchyprima for the help!