Some random markup and comment fixes