made sure all relevant fields use id_str, little clean up