more javascript order issue fixes