misc/minor cleanup and TODO adds