working on js, collecting updates from upstream