bedouin fixes, improvements