XSE with a couple of small fixes!