Minor edits to fix problems Stef pointed out