several minor improvements concerning wrapped classes and methods