added simulator, modified others