Some minor cleanup and add local jquery