tons of main and disease fixes
.