Little camera update, and little event fix