some new classes + fixes