Cleaning Up & Bug Fixes