CommandHandler commented. Few changes to parameter order to be
consistent in javadoc comments.