README changes and TODOs