moved all deps to project, and some small fixes.