Fixed some errors Rocky pointed out