Fix + more comments to the javascript