Move js support here, formatting fixups