refactoring, edit registration hit fixes