Miscellaneous changes and comments added