Improved lecture markup (2)