Lots of little fixes including major renovation of the disaster creation process.