Synced latest changes

Also fixed Colonel flair not showing correctly.