auth and stuff working better