Fixed up loads more derps in the code.