Merge "Update comments a bit"