Major set of minor revisions

fumbling the ball