a couple more tweaks from Jan