Some minor changes made