Reconfig simplify

@zaach - here is a combination of your PR and some addons/tests/simplifications/complications.