Ensure all functions have doc stubs, update naming of functions to be a little more consistent