Missing export and test
Remove old TODOs
Code tidying
Update docs
Updated TODOs
Updated DESCRIPTION