Lecture 2013 04 25

Incomplete, but contains some bugfixes (which I should have done in another branch).