small bugfix plus health_check() added