some minor tweaks and additions