Add .vp as a format
Merge fixes