last batch of fixes before i branched to refactor RAR into a superclass