Fixing Everything

Cleaning up merging mess.