Update several comments