make keys also commands
fix constant name
simplify mutex locks in Player