tabstabstabstabstabs
Fix up a few things so registration works