a couple more tweaks added