Final Commit for the day - adjusting some bugs