Added toasts for registering. Cleanup code