fixed key/entry porblem
cleaned up a little