Module 07 lab complete. Plus minor clean-up in module 07 code.