More edits to better build Xenin HD