small improvements in several classes