Update to latest version of jQuery, various clean up