refactoring of js basic funcs, and annotation bug fix
adding proper logging to node.py
Merge remote-tracking branch 'upstream/master'