Commiting some bug fixes for Homework 11