Fixed all of Erics comments