Improve battlemode, add support for keyId to string