jquery upgrade and minor tweaks