A few quick changes and incorporating final version