Small changes to endorsements, bug fixed