fixed ping poning issues and patched some stuff