add vpm and various fixes