cahpters 0, 1, 2: edits and cleanup