- add missing utils
- make MAC address selection more robust