Add some todo and improve README