switching camera ids, minor misc changes