Updates to sendoptode, cleanup.