openCtl changes

Tried fixing some loading of control files - it's a bit tricky and not
fully complete, so feel free to roll this back if it breaks other things
terribly.