misc adjustments; support for web based execution