removed jquery
more fixes
merge