some improvements in some basic classes