a few additional tweaks