added 2 new classes, thanks to pahimar for EE3
minor modifications