Bunch of fixes and some extensions - getting to ping