camera updated

and some other stuff