implement a few small tweaks