some tweaks uncovered in testing