Lab 8 Fixes

Update Lab 8