improved timestamps, added simulation class