made some argument handling a bit smoother