Added all the variable definitions
Adding the javascript translation
Fixed merging issues