Fixed errors, added suggestions