Few small bugs corrected