Add and standardize some comments