infrastructure improvements and auth work (wip)