General update and rearrange auth stuff