Descriptions, correct some function names