removed a few dumb panics