Changed position of simulator to utils, minor bug fixes etc