Updated comments and testing more javascript