Cleaned up code
Improved registaration error messages
1.0.1