fix some parameter names add some TODOs (still need to be fixed) minor grammar fix add missing parameter fix some doxygen tags