Add extra camera parameters, some quick fixes