[FOLD] Tuning and random fixes