2nd update

tweaked formatting, updated js file