klawiszki refactored
fixes