minor improvements cont.