Changed arguments for some functions
Updated docstrings