More small progress, and some simplification