Remove short argument names and fix documentation

See here