Registration Fixes

Fixes #21 and switches from a min/max delegate count to a flat count.