Update todo's and readme