a couple more tweaks