Fixing minor issues from previous versions

Use the new XBee modules addresses