Kb improvements

@johnnyman727 how about this one?