minor tweaks/additions