Fixed documentation comments, fixed function names.