tweaks
naming consistency for enumFactory consumers
half-assed store & emitter