stability fixes in unscramble
restart warning