Lab 9 Updates, Small Bug Fixes