Add IDs, fix garbage characters