Fixes to javascript working with Rx
Addressing to do items
More tasks