Improve help messages and argument ordering