Fix help message text and order