some new classes minor tweaks