Cleaned up a bunch of stuff to get the code base in a good condition for the user testing on wednesday.