Tweaks and cleanups

- Xenoarch 
- Bees
See commit log