project model, linting and various corrections