Updating comments, TODOs and README.