changed to new pvik version and fixed small bugs