Javascript edits
important merge