switch to plonk to utils functions, upgrade jquery, misc cleanup and tweaks