Last few bugs corrected.