VP81

Fixes #81
-- fixed some stuff
-- fixed other stuff