Changed make_cat_vircam to make_cat_vhs, plus other small changes