[improved] credits
[improved] key handling