fixed some minor yayit probs