final tweaks before branching to refactor