some argument tweaks