edits to chapters 1 and 2 (locks not released)