more tweaks from testing (master)