added disaster things
Minor changes to Disaster class.
Minor changes.
Random fixes. Emergency watch is good.
Minor test code changes.
Fixed Disaster class.