Addressing some TODOs

Also tidying up docstrings