small tweaks from Mike N