Saving without registration fails
Cleanups and clarifications