Homework 7 done, bug fixes still pending