Loyalty refactored; Cosmetic fixes