Changes to project, cleaned up a couple of things.