adjust helper names, classes
clean up base, more true reset