More fixes, and abstracting sections