fix the whole JS s..tuff, refs #19