improving camera handling