fixes + js