fixed disaster 1 and made Eric's recommended changes