Legends improvements and fixes