registration final fixes