IdGenerator fixes and comments

- following 94c64712894ff72e393ceb0e1ac528684a57bbd9