Cleaned up a lot of stuff and made all the changes for the name change.