javascript improvements
more javascript