many changes across the board -- most notably : Figured out a nifty way around writing builder rules with tons of else-ifs (for each alternative).