Fixed some of the js