some FIXES!!