Misc changes
More work on Vex