fix merge errors, update man page to include new and changed commands