Bug fix for tornado and earthquake

Fixed new bugs with tornado and earthquake due to new additions. Also
cleaned up some code indentation, cos it gave me a hard time finding the
problems....