renaming functions to match v1, as they probably should for ease of transition
Updating documentation, fixing formatting, renamed a few variables for consistancy