Added docs for multiple functions and renamed some