fix up issues introduced by recent work
update changelog and todo list