misc. tweaks
dispatch consolidation
version