Some clean up work, as well as getting the buttons to do stuff in the Homework files.