Updated simulation outputs, forgot to commmit #1 fix, moved comments around to reflect changed code