Working on signup / login auth & some other corrections