NG: more complete binding logic
- FIX: improve "ng_wait" logic
- FIX: add additional ng bindings