Shows key count now, and further improvements