Add MAP switch in batch summary, false by default
Redesign the -r and -br arguments, using -m to specify the underlying model