Fixed up my poor coding and commits