tweak arg handling, few more cleanups