Bug fixes and ping command