more work on lab generation
minor code changes