a few post-lab1 fixes