Fixeed various little bugs and uncommented some simulation output.