New project and minor fixes