Fix minor stuff
Implement ping tracking