Further edits. WIP : Few other corrections.