add project and some fixes