minor story additions; make roles more general