Upade classic walk on cX. Improve options functionality. Tidy simulator code.