VP94

Fixes #94
-- fixed some stuff
-- fixed other stuff