Modified project and dependencies a bit