tenant -> project, and many small fixes