more cam fixes (still cursed)
even less buggier