Fixed some things hopefully