Some code cleanup; better feedback on register
Merge pull request #31 from bparks/master

Some code cleanup; better feedback on register