bug fix: onlyKey(), and cosmetics