bugfixes/improvements in registration workflow.