Fixes and some remarks made in the classroom