fixed bugs/naming in simulator