add userName checkout for leadername + lot of fixes