Default health check timeout 30 seconds. Tidied up health check code. Made the health check optional.