Bug fix with project_id and general cleanup.