fix argv to be slightly better