updating to fix a few crash bugs