More tweaking to remove redundancies, added missing xinclude, and removed the {1..8} constructs from boot section as this is a recent bash addition