Updated readme and TODOs in code