Homework completed. More bug fixes.