Added monitor and improved pings