xbee tweaks from working session