lecture 04: more fixes