Minor changes and formating.