make options more easily configurable again