cleaned the js, other fixes.