A couple of bugs corrected, that I should have corrected before.