minor changes to key names, logging