Lab 17 updates
Cleanup