Change some js to reflect jquery's change of .live to .on, also fix some names.