Fix some minor problems in some of the new option processing code. Slight change in mem debugging TODO changes