more work on configurator, big thx to Shadow6363