Small changes, bugfix. Intentionally obscure commit message.