Bug fixes

* array support
* different key than esc supported