Key handler edits

Signed-off-by: Zeldo Kavira <zeldokavira@gmail.com>