tweaks
move mixins into modules w/ uniquely named constants (fix prod environment superclass-mismatch)