update a few bugs with accoutns and scrnS