New unflood options

This should do the trick to fulfill #77.