Made a few more changes to project!