more bedouin work, fixed ID collision warnings