More small updates to part 1