Fix the disaster area weights and range cutoff, refactor