WIP some updates per Wil Moore's suggestions