Fixed some stupid derps, with a lot of thanks to Ravn