Final Project Bug Functionality Fixes