Add TODO and improves/changes to README