added ms simulation functionality, other misc