Updated auth, added comments