End of lecture 7
small fixes