add various minor tweaks