Some changes on readme and todo files...