Fix RBW names.  Fix preselector in msa.py