Very small changes, plus reference.conf template