Fixed errors from week 1