major leader fix and more