more features
fixed merge conflict
added nodes for features of js