Homework 3 fixes