Updating documentation and some function names