Updated key handlers a bit