Improve heal and health command, fixes #348