WIP: Cleaning Source and Fixing Bugs