Add in ability to cache and change users
misc fix
Code fixes