Various updates

need to fix a bug when logged in as Brian