Added some JS related stuff