stable / session keys handled correctly
stable / minor changes with style