some tweaks, consistency