some tweaks, better coverage