Okay, some final edits to my CS.