improve documentation
add capability for easier testing of activated or deactivated features
improve doc