updated todo, few little things