A number of small changes added