Added a lot of functionality and cleaned up a few things