Updated ReadMe and todo