Some camera/light improvements