fixes and improvements to disaster effect, commit 1 of 2
fixes and improvements to disaster effect, commit 2 of 2