fixing registration issues and bugs