Bunch of updates
ENB working!

Signed-off-by: Alec Cumming <alec.cumming@gmail.com>