-small changes
need to test simulator, state, basis