changed phrasing of logs, updated TODO