deployment bugfix, options/config revamp