EJS javascript support v. 1.5

And many more changes and fixes