Changes here and there. more polishing