new camera models

+ cosmetic fixes