Fixes + update js