Make things more generic

* Catch-up forgotten bits
* Use variables to control whether sections get run or not