VP20744187

-- fixed some stuff
-- fixed other stuff