Updates and crash fixes