#345: updated keys
#345: fixed presenters, etc