Fixed the last things hopefully