deal with a bunch of the 487 todos.
more TODOs for 487 notes.