Lots of changes to enums and auth saving.