Add in flood protection and clean up some things.