Updated simulator code, updated code for oct. 8 deliverable in omc (optimized move counter)