tweaking JS references everywhere for time being