Fixed up my mistakes