Playing working and small issues fixed