update a few things, especially don't crash