a bit of fixes and redoes with endorsement module