VP82

Fixes #82
-- fixed some stuff
-- fixed other stuff