Updating docs again. 

* Stop using @callback as it messes up jsdoc for some reason.
* Stop using @returns in places where we don't return the said value but instead pass in the value to the given callback function.