Lab 10 Fixes

Fixes for Lab 10