Improved style and other corrections