minor improvements cont'd