Fixed some silly crashing bugs and things