Various js fixes, include replace jq by $