minor changes

minor changes to org model and some other little changes regarding
registration.