Small Readme fix and update of some the TODO file.