History: Some bugs fixed. More remain.