minor improvements
More proxy generalizations