refactoring, fix registering actions