couple more TODOs, mostly renaming badly named variables