Update the TODOs
Implements some more options