Final revision of the lab.

Pending review by Alex, and final testing by Oliver.