All the review comments from KFC. Mostly javadoc comments, more optimal xml header regexp