Commenting, small bug fix w/r/t turn-taking, misc.