Updates to js mostly