minor formatting fixes and more TODOs