added non motor classes
minor tweaks
more upadtes
updates