minor tweaks as a prestage to dropping in more code