Updating a few bits and bobs in the core class module
Adding more updates to the Registration procedure