Sone fixes
Still problems,,