add key evend  & fix a little