Comment TODOs, comment cleanup, inlined on_board functions as per
existing todo.