Some editing
Again few changes