Misc changes to things

They really needed to be fixed kinda