* Adding some crashfixes