ES tweaks

* improve logging
* make sure the COMMAND field doesn't get overloaded