fixed some crashes, not very carefully

also, temporarily turned off some code that ran forever