Fixed up some basic mistakes