more project-specific work and general polishing