fixed lints, removed duplicate keyboundaries.