bunch of crashes fixed