make sure we don't keep adding penalties after first add "Other" penalty for future plugin use
fix rare issue with alias (maybe) update some tests
moved some classes around