Fix the last few mistakes. Were good now @confuser