Added new MAs and ROs and cleaned up a lot of things.