My changes

Cleaned up some of the code, and got a few things in order.