Partial Simulation Class

Other comment changes, etc. (No code changes)