minor changes to ordering and commenting on args