Done some todo tasks