individual elibility fixes
Merge pull request #53 from bitzesty/eligibility-fixes

individual elibility fixes