class/events registration less tweaks/adds