misc changes

improved timeout error reporting
featureScopes renamed to featureScope