renamed to-dos, added stuff from past half week