Merged in some debug logging statments from noaa_dev branch