Updates for today.

Made a bunch of small changes and got rid of some code that was just adding overhead.