New usage message to fix some short option issues