knock these off the TODO list -- last few commits resolve them