diff --git a/data/config.toml b/data/config.toml
index 85d2318..3ad5e0e 100644
--- a/data/config.toml
+++ b/data/config.toml
@@ -1,210 +1,5 @@
 default_scene_file = "data/scenes/cornell_box.toml"
 
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "distant camera"
-# look_from = [-100, 0, 0]
-# look_at = [0, 0, 0]
-# aperture_size = 0.03
-# vfov = 20
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "cube camera"
-# look_from = [4, 3, 1]
-# look_at = [0, 0, 0]
-# aperture_size = 0.2
-# focal_distance = 5
-# vfov = 35.4
-
-
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "sun test camera"
-# look_from = [-5.0, 0.0, 0.4]
-# look_at = [0.0, 0.0, -0.7]
-# aperture_size = 0.001
-# focal_distance = 5.0
-# vfov = 16.2
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "wideangle sun test camera reverse"
-# look_from = [5, 0, 0]
-# look_at = [0.0, 0.0, -0.4]
-# aperture_size = 0.02
-# focal_distance = 5.0
-# vfov = 90.0
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "wideangle sun test camera side"
-# look_from = [0, -5, 0]
-# look_at = [0.0, 0.0, -0.4]
-# aperture_size = 0.02
-# focal_distance = 5.0
-# vfov = 90.0
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "closeup camera"
-# look_from = [-1, 0, 0]
-# look_at = [0, 0, 0]
-# aperture_size = 0.03
-# focal_distance = 1.0
-# vfov = 45
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "closeup zoom camera"
-# look_from = [-1, 0, 0]
-# look_at = [0.0, 0.0, -0.1]
-# aperture_size = 0.03
-# focal_distance = 1.0
-# vfov = 5
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "veach mis camera"
-# look_from = [-10.0, 0.0, 3.0]
-# look_at = [0.0, 0.0, 0.0]
-# aperture_size = 0.001
-# focal_distance = 10.0
-# vfov = 60.8
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "wideangle sun test camera"
-# look_from = [-5.0, 0.0, 0.5]
-# look_at = [0.0, 0.0, 0.4]
-# aperture_size = 0.1
-# focal_distance = 5.0
-# vfov = 45.0
-
-
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "debug"
-# look_from = [-1.3, 0.0, 0.0]
-# look_at = [0.0, 0.0, 0.0]
-# aperture_size = 0.02
-# focal_distance = 5.0
-# vfov = 60.0
-
-
-# somewhat focused
-# [[cameras]]
-# type="RealisticCamera"
-# name = "petzval kodak"
-# lens_spec = "data/cameras/petzval_kodak.txt"
-# look_from = [5.0, -10.0, 0.1]
-# look_at = [0.0, 0.0, 0.0]
-# focal_adjustment = 27.0
-# fstop = 4.0
-# sensor_size = 35.0
-# radial_bins = 512
-# wavelength_bins = 512
-# [cameras.aperture]
-# type = "Bladed"
-# blades = 6
-# sharpness = 2.0
-
-# [[cameras]]
-# type="RealisticCamera"
-# name = "petzval kodak cornell"
-# lens_spec = "data/cameras/petzval_kodak.txt"
-# look_from = [ -3.8, 0.278, 0.273]
-# look_at = [0.0, 0.278, 0.273]
-# focal_adjustment = 23.0
-# fstop = 4.0
-# sensor_size = 35.0
-# radial_bins = 512
-# wavelength_bins = 512
-# [cameras.aperture]
-# type = "Bladed"
-# blades = 6
-# sharpness = 2.0
-
-
-# [[cameras]]
-# type="RealisticCamera"
-# name = "wideangle 2"
-# lens_spec = "data/cameras/wideangle_2.txt"
-# look_from = [-35.0, 0.0, -0.5]
-# look_at = [0.0, 0.0, -0.5]
-# focal_adjustment = 0.0
-# fstop = 6.0
-# sensor_size = 35.0
-# radial_bins = 512
-# wavelength_bins = 512
-# [cameras.aperture]
-# type = "Bladed"
-# blades = 6
-# sharpness = 2.0
-
-
-# # seems really hard to focus
-# [[cameras]]
-# type="RealisticCamera"
-# name = "simple 2"
-# lens_spec = "data/cameras/simple_2.txt"
-# look_from = [-2.0, 0.0, 0.0]
-# look_at = [0.0, 0.0, -0.5]
-# focal_adjustment = 5.0
-# fstop = 6.0
-# sensor_size = 35.0
-# radial_bins = 512
-# wavelength_bins = 512
-# [cameras.aperture]
-# type = "Bladed"
-# blades = 6
-# sharpness = 2.0
-
-
-# [[cameras]]
-# type="RealisticCamera"
-# name = "telephoto"
-# lens_spec = "data/cameras/kreitzer_telephoto.txt"
-# look_from = [0.0, -20.0, 1.0]
-# look_at = [0.0, 0.0, 0.0]
-# focal_adjustment = 50.0
-# fstop = 10.0
-# sensor_size = 100.0
-# radial_bins = 256
-# wavelength_bins = 256
-# [cameras.aperture]
-# type = "Bladed"
-# blades = 6
-# sharpness = 2.0
-
-
-# [[cameras]]
-# type = "PanoramaCamera"
-# name = "panorama"
-# look_from = [0.0, 0.0, -0.5]
-# look_at = [1.0, 0.0, -0.5]
-# fov = [360, 180]
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "simple camera"
-# look_from = [-5, 0, 0]
-# look_at = [0, 0, 0]
-# aperture_size = 0.01
-# focal_distance = 5.0
-# vfov = 30.0
-
-
 [renderer]
 # naive is 23.6 mrays/sec
 # type="Naive"
@@ -212,7 +7,6 @@ type = "Tiled"
 # tiled at 64 64 is 23.2 mrays/sec
 # tiled at 32 32 is 23.9 mrays/sec
 tile_size = [32, 32]
-# type="Preview"
 # selected_preview_film_id = 0
 
 [[render_settings]]
@@ -222,24 +16,7 @@ min_samples = 32
 min_bounces = 1
 max_bounces = 12
 hwss = false
-# camera_id = "simple camera"
-# camera_id = "caustic test camera"
-# camera_id = "wideangle sun test camera"
-# camera_id = "sun test camera"
-# camera_id = "blackbox camera"
-# camera_id = "closeup camera"
-# camera_id = "panorama"
-# camera_id = "cornell camera"
-camera_id = "true cornell camera"
-# camera_id = "distant camera"
-# camera_id = "veach mis camera"
-# camera_id = "wideangle sun test camera side"
-
-# realistic cameras
-# camera_id = "telephoto"
-# camera_id = "simple 2"
-# camera_id = "petzval kodak"
-# camera_id = "petzval kodak cornell"
+camera_id = "main"
 russian_roulette = true
 only_direct = false
 premultiply = 10.0
@@ -247,7 +24,6 @@ premultiply = 10.0
 # wavelength_bounds = [500.0, 510.0]
 [render_settings.colorspace_settings]
 type = "Rec2020"
-
 [render_settings.tonemap_settings]
 type = "Clamp"
 exposure = 1.0
@@ -271,9 +47,9 @@ medium_aware = false
 # selected_pair = [1,2]
 # selected_pair = [1,1]
 [render_settings.resolution]
-width = 2560
-height = 1440
-# width = 1024
-# height = 1024
+# width = 2560
+# height = 1440
+width = 1024
+height = 1024
 # width = 4096
 # height = 2048
diff --git a/data/config_test_blackbox.toml b/data/config_test_blackbox.toml
index d3279d1..72c59e5 100644
--- a/data/config_test_blackbox.toml
+++ b/data/config_test_blackbox.toml
@@ -7,14 +7,6 @@ default_scene_file = "data/scenes/test_blackbox.toml"
 type="Naive"
 
 
-[[cameras]]
-type="SimpleCamera"
-name = "camera"
-look_from = [-0.8, 0.0, 0.0]
-look_at = [0, 0, 0]
-aperture_size = 0.03
-focal_distance = 0.8
-vfov = 90
 
 [[render_settings]]
 threads = 22
@@ -37,7 +29,6 @@ width = 1024
 height = 1024
 
 
-
 [[render_settings]]
 threads = 22
 filename = "test_blackbox_pt"
diff --git a/data/config_test_candela_calibration.toml b/data/config_test_candela_calibration.toml
index 06fbe75..ba4bf62 100644
--- a/data/config_test_candela_calibration.toml
+++ b/data/config_test_candela_calibration.toml
@@ -1,16 +1,6 @@
 default_scene_file = "data/scenes/candela_calibration.toml"
 
 
-[[cameras]]
-type="SimpleCamera"
-name = "candela"
-look_from = [ -5.0, 0.0, 0.0]
-look_at = [0.0, 0.0, 0.0]
-aperture_size = 0.03
-focal_distance = 5.0
-vfov = 27.8
-
-
 [renderer]
 type="Naive"
 # type="Preview"
diff --git a/data/config_test_cornell_box.toml b/data/config_test_cornell_box.toml
index 6b93c3b..72d51e9 100644
--- a/data/config_test_cornell_box.toml
+++ b/data/config_test_cornell_box.toml
@@ -1,13 +1,5 @@
 default_scene_file = "data/scenes/cornell_box.toml"
 
-[[cameras]]
-type="SimpleCamera"
-name = "true cornell camera"
-look_from = [ -0.8, 0.278, 0.273]
-look_at = [0.0, 0.278, 0.273]
-aperture_size = 0.01
-focal_distance = 1.1
-vfov = 37.8
 
 
 [renderer]
diff --git a/data/config_test_lighting_hdri.toml b/data/config_test_lighting_hdri.toml
index 97ae736..00ea8b7 100644
--- a/data/config_test_lighting_hdri.toml
+++ b/data/config_test_lighting_hdri.toml
@@ -4,16 +4,6 @@ default_scene_file = "data/scenes/hdri_test.toml"
 type = "Preview"
 selected_preview_film_id = 0
 
-
-[[cameras]]
-type="SimpleCamera"
-name = "camera"
-look_from = [-1.5, 0.0, 0.0]
-look_at = [0, 0, 0]
-aperture_size = 0.03
-focal_distance = 1.0
-vfov = 90
-
 [[render_settings]]
 threads = 22
 filename = "test_lighting_hdri_pt"
diff --git a/data/config_test_lighting_north.toml b/data/config_test_lighting_north.toml
index 82f3c55..c880a7c 100644
--- a/data/config_test_lighting_north.toml
+++ b/data/config_test_lighting_north.toml
@@ -4,16 +4,6 @@ default_scene_file = "data/scenes/test_lighting_north.toml"
 type = "Preview"
 selected_preview_film_id = 0
 
-
-[[cameras]]
-type="SimpleCamera"
-name = "camera"
-look_from = [-1.5, 0.0, 0.0]
-look_at = [0, 0, 0]
-aperture_size = 0.001
-focal_distance = 1.5
-vfov = 90
-
 [[render_settings]]
 threads = 1
 filename = "test_lighting_north_pt"
diff --git a/data/config_test_whitefurnace.toml b/data/config_test_whitefurnace.toml
index 2a90c5a..0b7fe69 100644
--- a/data/config_test_whitefurnace.toml
+++ b/data/config_test_whitefurnace.toml
@@ -4,16 +4,6 @@ type="Naive"
 # type = "Preview"
 # selected_preview_film_id = 0
 
-
-[[cameras]]
-type="SimpleCamera"
-name = "camera"
-look_from = [-1.5, 0.0, 0.0]
-look_at = [0, 0, 0]
-aperture_size = 0.03
-focal_distance = 1.0
-vfov = 90
-
 [[render_settings]]
 threads = 22
 filename = "test_whitefurnace_pt"
diff --git a/data/raymarch_config.toml b/data/raymarch_config.toml
index d7d7f5c..a245743 100644
--- a/data/raymarch_config.toml
+++ b/data/raymarch_config.toml
@@ -1,24 +1,5 @@
 default_scene_file = "data/scenes/raymarch.toml"
 
-
-[[cameras]]
-type = "SimpleCamera"
-name = "distant camera"
-look_from = [-100, 0, 0]
-look_at = [0, 0, 0]
-aperture_size = 0.03
-vfov = 20
-
-[[cameras]]
-type = "SimpleCamera"
-name = "simple camera"
-look_from = [5, 0, 0]
-look_at = [0, 0, 0]
-aperture_size = 0.04
-focal_distance = 5.0
-vfov = 35.4
-
-
 [renderer]
 # type="Naive"
 type = "Preview"
diff --git a/data/scenes/bokeh_test.toml b/data/scenes/bokeh_test.toml
index dc68251..3533d24 100644
--- a/data/scenes/bokeh_test.toml
+++ b/data/scenes/bokeh_test.toml
@@ -5,13 +5,12 @@ meshes = "data/lib_meshes.toml"
 env_sampling_probability = 0.5
 
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 0.1
 texture_name = "autumn_park_8k"
 # texture_name = "moonlit_golf_8k"
 
 
-
 [[instances]]
 material_name = "diffuse_light"
 [instances.aggregate]
@@ -670,10 +669,9 @@ origin = [0.5, 20.0, 0.0]
 
 [[cameras]]
 type = "SimpleCamera"
-name = "wideangle sun test camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.5]
 look_at = [0.0, 0.0, 0.4]
 aperture_size = 0.1
 focal_distance = 5.0
 vfov = 45.0
-
diff --git a/data/scenes/candela_calibration.toml b/data/scenes/candela_calibration.toml
index 5518401..5860b8e 100644
--- a/data/scenes/candela_calibration.toml
+++ b/data/scenes/candela_calibration.toml
@@ -4,12 +4,11 @@ materials = "data/lib_materials.toml"
 meshes = "data/lib_meshes.toml"
 env_sampling_probability = 0.0
 [environment]
-type="Constant"
+type = "Constant"
 strength = 0.0
 color = "D65"
 
 
-
 # floor on side
 [[instances]]
 material_name = "diffuse_540THz"
@@ -20,7 +19,7 @@ origin = [0.0, 0.0, 0.0]
 
 [[cameras]]
 type = "SimpleCamera"
-name = "cornell camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.0]
 look_at = [0.0, 0.0, 0.0]
 aperture_size = 0.02
diff --git a/data/scenes/caustic_test_scene.toml b/data/scenes/caustic_test_scene.toml
index 4db6a1d..15a16c7 100644
--- a/data/scenes/caustic_test_scene.toml
+++ b/data/scenes/caustic_test_scene.toml
@@ -28,7 +28,7 @@ name = "caustic_test_obj"
 
 [[cameras]]
 type = "SimpleCamera"
-name = "caustic test camera"
+name = "main"
 look_from = [18, 5, 3]
 look_at = [0.0, 0.0, -0.4]
 aperture_size = 0.03
diff --git a/data/scenes/cornell_box.toml b/data/scenes/cornell_box.toml
index 55da39c..8c07da0 100644
--- a/data/scenes/cornell_box.toml
+++ b/data/scenes/cornell_box.toml
@@ -30,7 +30,7 @@ name = "cornell_box"
 
 [[cameras]]
 type = "SimpleCamera"
-name = "true cornell camera"
+name = "main"
 look_from = [-0.8, 0.278, 0.273]
 look_at = [0.0, 0.278, 0.273]
 aperture_size = 0.01
diff --git a/data/scenes/cornell_box_diamond_arrangement.toml b/data/scenes/cornell_box_diamond_arrangement.toml
index 08ab897..a40f5b2 100644
--- a/data/scenes/cornell_box_diamond_arrangement.toml
+++ b/data/scenes/cornell_box_diamond_arrangement.toml
@@ -5,7 +5,7 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.01
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 0.1
 texture_name = "kiara_dawn_8k"
 
@@ -121,7 +121,6 @@ radius = 0.2
 origin = [0.0, 0.0, -0.15]
 
 
-
 # [[instances]]
 # material_name = "ggx_copper"
 # [instances.aggregate]
@@ -131,7 +130,7 @@ origin = [0.0, 0.0, -0.15]
 
 [[cameras]]
 type = "SimpleCamera"
-name = "cornell camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.0]
 look_at = [0.0, 0.0, 0.0]
 aperture_size = 0.02
diff --git a/data/scenes/cornell_box_diamond_gem.toml b/data/scenes/cornell_box_diamond_gem.toml
index c9db527..1e00434 100644
--- a/data/scenes/cornell_box_diamond_gem.toml
+++ b/data/scenes/cornell_box_diamond_gem.toml
@@ -5,12 +5,11 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.0
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 1.0
 texture_name = "kiara_dawn_8k"
 
 
-
 [[instances]]
 material_name = "sharp_light_fluorescent"
 [instances.aggregate]
@@ -88,7 +87,7 @@ name = "brilliant_diamond"
 
 [[cameras]]
 type = "SimpleCamera"
-name = "cornell camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.0]
 look_at = [0.0, 0.0, 0.0]
 aperture_size = 0.02
diff --git a/data/scenes/cornell_box_hdri_test.toml b/data/scenes/cornell_box_hdri_test.toml
index fcb1aa7..5eac52d 100644
--- a/data/scenes/cornell_box_hdri_test.toml
+++ b/data/scenes/cornell_box_hdri_test.toml
@@ -5,8 +5,8 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 1.0
 [environment]
-type="HDRI"
-strength =1.0
+type = "HDRI"
+strength = 1.0
 texture_name = "machine_shop_4k"
 # [environment.importance_map]
 # # width = 2048
@@ -27,7 +27,6 @@ texture_name = "machine_shop_4k"
 # interpolation_mode = "Cubic"
 
 
-
 [[instances]]
 material_name = "diffuse_light"
 [instances.aggregate]
@@ -85,7 +84,7 @@ two_sided = true
 
 [[cameras]]
 type = "SimpleCamera"
-name = "cornell camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.0]
 look_at = [0.0, 0.0, 0.0]
 aperture_size = 0.02
diff --git a/data/scenes/cornell_box_lenses.toml b/data/scenes/cornell_box_lenses.toml
index 9965fd3..c8e9806 100644
--- a/data/scenes/cornell_box_lenses.toml
+++ b/data/scenes/cornell_box_lenses.toml
@@ -5,13 +5,11 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.01
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 1.0
 texture_name = "kiara_dawn_8k"
 
 
-
-
 [[instances]]
 material_name = "sharp_light_xenon"
 [instances.aggregate]
@@ -79,7 +77,7 @@ scale = [2.0, 2.0, 2.0]
 
 [[cameras]]
 type = "SimpleCamera"
-name = "cornell camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.0]
 look_at = [0.0, 0.0, 0.0]
 aperture_size = 0.02
diff --git a/data/scenes/cornell_box_medium.toml b/data/scenes/cornell_box_medium.toml
index e577919..054c26f 100644
--- a/data/scenes/cornell_box_medium.toml
+++ b/data/scenes/cornell_box_medium.toml
@@ -6,7 +6,7 @@ mediums = "data/lib_mediums.toml"
 
 env_sampling_probability = 0.0
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 0.0
 texture_name = "kiara_dawn_8k"
 
@@ -99,7 +99,7 @@ origin = [0.1, 0.1, -0.15]
 
 [[cameras]]
 type = "SimpleCamera"
-name = "cornell camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.0]
 look_at = [0.0, 0.0, 0.0]
 aperture_size = 0.02
diff --git a/data/scenes/cornell_box_metals_and_dielectrics.toml b/data/scenes/cornell_box_metals_and_dielectrics.toml
index 26ae6a1..d12e924 100644
--- a/data/scenes/cornell_box_metals_and_dielectrics.toml
+++ b/data/scenes/cornell_box_metals_and_dielectrics.toml
@@ -6,12 +6,12 @@ meshes = "data/lib_meshes.toml"
 env_sampling_probability = 0.9
 
 [environment]
-type="HDRI"
-strength =0.4
+type = "HDRI"
+strength = 0.4
 texture_name = "kiara_dawn_8k"
 [[environment.rotation]]
-axis=[0, 0, 1]
-angle=140
+axis = [0, 0, 1]
+angle = 140
 [environment.importance_map]
 # width = 2048
 # height = 2048
@@ -19,8 +19,6 @@ width = 512
 height = 512
 
 
-
-
 [[instances]]
 material_name = "diffuse_light_xenon"
 [instances.aggregate]
@@ -125,7 +123,7 @@ origin = [-0.51, -0.71, -0.79]
 
 [[cameras]]
 type = "SimpleCamera"
-name = "cornell camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.0]
 look_at = [0.0, 0.0, 0.0]
 aperture_size = 0.02
diff --git a/data/scenes/cornell_box_parallel_prism.toml b/data/scenes/cornell_box_parallel_prism.toml
index 29e203a..16b0c24 100644
--- a/data/scenes/cornell_box_parallel_prism.toml
+++ b/data/scenes/cornell_box_parallel_prism.toml
@@ -81,7 +81,7 @@ two_sided = true
 
 [[cameras]]
 type = "SimpleCamera"
-name = "cornell camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.0]
 look_at = [0.0, 0.0, 0.0]
 aperture_size = 0.02
diff --git a/data/scenes/cornell_box_single_orb_caustic.toml b/data/scenes/cornell_box_single_orb_caustic.toml
index a810eb8..c6764e4 100644
--- a/data/scenes/cornell_box_single_orb_caustic.toml
+++ b/data/scenes/cornell_box_single_orb_caustic.toml
@@ -5,12 +5,11 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.0
 [environment]
-type="Constant"
+type = "Constant"
 strength = 0.00000
 color = "D65"
 
 
-
 [[instances]]
 material_name = "sharp_light"
 [instances.aggregate]
@@ -66,8 +65,6 @@ normal = "X"
 two_sided = true
 
 
-
-
 # sphere on top
 [[instances]]
 material_name = "ggx_glass_dispersive"
@@ -77,7 +74,6 @@ radius = 0.3
 origin = [0.1, 0.1, -0.15]
 
 
-
 # [[instances]]
 # material_name = "ggx_copper"
 # [instances.aggregate]
@@ -87,7 +83,7 @@ origin = [0.1, 0.1, -0.15]
 
 [[cameras]]
 type = "SimpleCamera"
-name = "cornell camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.0]
 look_at = [0.0, 0.0, 0.0]
 aperture_size = 0.02
diff --git a/data/scenes/cornell_box_textured_walls.toml b/data/scenes/cornell_box_textured_walls.toml
index 26bf17a..0185de5 100644
--- a/data/scenes/cornell_box_textured_walls.toml
+++ b/data/scenes/cornell_box_textured_walls.toml
@@ -5,7 +5,7 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.1
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 1.0
 texture_name = "kiara_dawn_8k"
 
@@ -79,7 +79,7 @@ two_sided = true
 
 [[cameras]]
 type = "SimpleCamera"
-name = "cornell camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.0]
 look_at = [0.0, 0.0, 0.0]
 aperture_size = 0.02
diff --git a/data/scenes/hdri_test.toml b/data/scenes/hdri_test.toml
index 7bd65c3..164b370 100644
--- a/data/scenes/hdri_test.toml
+++ b/data/scenes/hdri_test.toml
@@ -5,7 +5,7 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.9
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 1.0
 texture_name = "machine_shop_4k"
 [environment.importance_map]
@@ -22,3 +22,12 @@ type = "Sphere"
 radius = 1.0
 origin = [0.0, 0.0, 0.0]
 
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [-5.0, 0.0, 0.4]
+look_at = [0.0, 0.0, -0.7]
+aperture_size = 0.001
+focal_distance = 5.0
+vfov = 16.2
diff --git a/data/scenes/hdri_test_2.toml b/data/scenes/hdri_test_2.toml
index 9a612cc..afc3633 100644
--- a/data/scenes/hdri_test_2.toml
+++ b/data/scenes/hdri_test_2.toml
@@ -96,7 +96,7 @@ origin = [0.6, -0.8, -0.8]
 
 [[cameras]]
 type = "SimpleCamera"
-name = "sun test camera"
+name = "main"
 look_from = [-5.0, 0.0, 0.4]
 look_at = [0.0, 0.0, -0.7]
 aperture_size = 0.001
diff --git a/data/scenes/metals_spectral_breakdown.toml b/data/scenes/metals_spectral_breakdown.toml
index b595499..7fc8bbd 100644
--- a/data/scenes/metals_spectral_breakdown.toml
+++ b/data/scenes/metals_spectral_breakdown.toml
@@ -5,7 +5,7 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.2
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 0.0
 texture_name = "autumn_park_8k"
 
@@ -57,3 +57,12 @@ translate = [0.0, 0.0, 0.333]
 [[instances.transform.rotate]]
 axis = [0.0, 1.0, 0.0]
 angle = 35
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [-5.0, 0.0, 0.0]
+look_at = [0.0, 0.0, 0.0]
+aperture_size = 0.02
+focal_distance = 5.0
+vfov = 27.8
diff --git a/data/scenes/raymarch.toml b/data/scenes/raymarch.toml
index eee6f23..1cf2afe 100644
--- a/data/scenes/raymarch.toml
+++ b/data/scenes/raymarch.toml
@@ -31,3 +31,12 @@ material_name = "lambertian_white"
 type = "Sphere"
 radius = 1.0
 origin = [0.0, 0.0, 0.0]
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [-5.0, 0.0, 0.4]
+look_at = [0.0, 0.0, -0.7]
+aperture_size = 0.001
+focal_distance = 5.0
+vfov = 16.2
diff --git a/data/scenes/sun_test.toml b/data/scenes/sun_test.toml
index aa45322..3c5bda6 100644
--- a/data/scenes/sun_test.toml
+++ b/data/scenes/sun_test.toml
@@ -4,14 +4,13 @@ materials = "data/lib_materials.toml"
 meshes = "data/lib_meshes.toml"
 env_sampling_probability = 0.5
 [environment]
-type="Sun"
+type = "Sun"
 strength = 0.4
 angular_diameter = 0.0565
 sun_direction = [1.0, 0.0, 1.0]
 color = "D65"
 
 
-
 # # light above
 # [[instances]]
 # material_name = "sharp_light"
@@ -91,3 +90,12 @@ type = "Sphere"
 radius = 0.2
 origin = [0.6, -0.8, -0.8]
 
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [-5.0, 0.0, 0.4]
+look_at = [0.0, 0.0, -0.7]
+aperture_size = 0.001
+focal_distance = 5.0
+vfov = 16.2
diff --git a/data/scenes/test_blackbox.toml b/data/scenes/test_blackbox.toml
index 2a452af..08585de 100644
--- a/data/scenes/test_blackbox.toml
+++ b/data/scenes/test_blackbox.toml
@@ -4,7 +4,7 @@ materials = "data/lib_materials.toml"
 meshes = "data/lib_meshes.toml"
 env_sampling_probability = 1.0
 [environment]
-type="Constant"
+type = "Constant"
 strength = 1.0
 color = "D65"
 
@@ -65,7 +65,7 @@ two_sided = true
 
 [[cameras]]
 type = "SimpleCamera"
-name = "blackbox camera"
+name = "main"
 look_from = [0.5, 0.0, 0.0]
 look_at = [0, 0, 0]
 aperture_size = 0.001
diff --git a/data/scenes/test_lighting_north.toml b/data/scenes/test_lighting_north.toml
index d01675c..407d4af 100644
--- a/data/scenes/test_lighting_north.toml
+++ b/data/scenes/test_lighting_north.toml
@@ -5,14 +5,13 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.0
 [environment]
-type="Sun"
+type = "Sun"
 strength = 0.0
 angular_diameter = 0.0565
 sun_direction = [0.0, 0.0, 1.0]
 color = "D65"
 
 
-
 [[instances]]
 material_name = "diffuse_light_flat_x10"
 [instances.aggregate]
@@ -32,3 +31,13 @@ material_name = "lambertian_white"
 type = "Sphere"
 radius = 1.0
 origin = [0.0, 0.0, 0.0]
+
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [-0.8, 0.278, 0.273]
+look_at = [0.0, 0.278, 0.273]
+aperture_size = 0.01
+focal_distance = 1.1
+vfov = 37.8
diff --git a/data/scenes/test_menger.toml b/data/scenes/test_menger.toml
index f9f8ee8..111aca0 100644
--- a/data/scenes/test_menger.toml
+++ b/data/scenes/test_menger.toml
@@ -5,7 +5,7 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.5
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 1.0
 texture_name = "machine_shop_4k"
 
@@ -90,3 +90,12 @@ translate = [0.0, 0.0, 0.0]
 # [[instances.transform.rotate]]
 # axis = [0.0, 0.1, 1.0]
 # angle = 40
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [0.5, 0.0, 0.0]
+look_at = [0, 0, 0]
+aperture_size = 0.001
+focal_distance = 0.5
+vfov = 70.4
diff --git a/data/scenes/test_nee_sphere.toml b/data/scenes/test_nee_sphere.toml
index 18071a8..ffee1d3 100644
--- a/data/scenes/test_nee_sphere.toml
+++ b/data/scenes/test_nee_sphere.toml
@@ -5,7 +5,7 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.0
 [environment]
-type="Sun"
+type = "Sun"
 strength = 0.0
 angular_diameter = 0.0565
 sun_direction = [0.0, 0.0, 1.0]
@@ -83,3 +83,12 @@ size = [20, 20]
 origin = [16.0, 0.0, 0.0]
 normal = "X"
 two_sided = true
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [0.5, 0.0, 0.0]
+look_at = [0, 0, 0]
+aperture_size = 0.001
+focal_distance = 0.5
+vfov = 70.4
diff --git a/data/scenes/test_nonuniform_scale.toml b/data/scenes/test_nonuniform_scale.toml
index dbf09aa..e227a5d 100644
--- a/data/scenes/test_nonuniform_scale.toml
+++ b/data/scenes/test_nonuniform_scale.toml
@@ -5,7 +5,7 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.9
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 1.0
 texture_name = "autumn_park_8k"
 [environment.importance_map]
@@ -27,3 +27,12 @@ translate = [0.0, 0.0, 0.0]
 [[instances.transform.rotate]]
 axis = [1.0, 0.0, 0.0]
 angle = 20
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [0.5, 0.0, 0.0]
+look_at = [0, 0, 0]
+aperture_size = 0.001
+focal_distance = 0.5
+vfov = 70.4
diff --git a/data/scenes/test_prism.toml b/data/scenes/test_prism.toml
index 94c2818..033473c 100644
--- a/data/scenes/test_prism.toml
+++ b/data/scenes/test_prism.toml
@@ -76,3 +76,12 @@ translate = [0.0, 0.0, -0.1]
 [[instances.transform.rotate]]
 axis = [0.0, 0.0, 1.0]
 angle = 90
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [0.5, 0.0, 0.0]
+look_at = [0, 0, 0]
+aperture_size = 0.001
+focal_distance = 0.5
+vfov = 70.4
diff --git a/data/scenes/test_rtiow_scene_2.toml b/data/scenes/test_rtiow_scene_2.toml
index 98e34e9..e30f75d 100644
--- a/data/scenes/test_rtiow_scene_2.toml
+++ b/data/scenes/test_rtiow_scene_2.toml
@@ -5,7 +5,7 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.0
 [environment]
-type="Constant"
+type = "Constant"
 strength = 1.0
 color = "simple_sky_blue"
 
@@ -18,7 +18,6 @@ radius = 5.0
 origin = [3.0, -6.0, 8.0]
 
 
-
 # colored spheres
 [[instances]]
 material_name = "ggx_glass"
@@ -57,3 +56,12 @@ size = [40, 40]
 origin = [0.0, 0.0, -0.5]
 normal = "Z"
 two_sided = true
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [0.5, 0.0, 0.0]
+look_at = [0, 0, 0]
+aperture_size = 0.001
+focal_distance = 0.5
+vfov = 70.4
diff --git a/data/scenes/test_sampling_methods.toml b/data/scenes/test_sampling_methods.toml
index 2253df1..4457be0 100644
--- a/data/scenes/test_sampling_methods.toml
+++ b/data/scenes/test_sampling_methods.toml
@@ -5,14 +5,13 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.0
 [environment]
-type="Sun"
+type = "Sun"
 strength = 0.0
 angular_diameter = 0.0565
 sun_direction = [0.0, 0.0, 1.0]
 color = "D65"
 
 
-
 [[instances]]
 material_name = "diffuse_light_flat_x10"
 [instances.aggregate]
@@ -52,3 +51,12 @@ size = [10, 10]
 origin = [0.0, 0.0, 0.0]
 normal = "Z"
 two_sided = true
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [0.5, 0.0, 0.0]
+look_at = [0, 0, 0]
+aperture_size = 0.001
+focal_distance = 0.5
+vfov = 70.4
diff --git a/data/scenes/test_veach_mis.toml b/data/scenes/test_veach_mis.toml
index a295418..4eb89d8 100644
--- a/data/scenes/test_veach_mis.toml
+++ b/data/scenes/test_veach_mis.toml
@@ -7,7 +7,7 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.0
 [environment]
-type="HDRI"
+type = "HDRI"
 strength = 0.1
 texture_name = "machine_shop_4k"
 
@@ -104,7 +104,6 @@ axis = [0.0, 1.0, 0.0]
 angle = -20.9
 
 
-
 [[instances]]
 material_name = "ggx_iron_roughness0_0002"
 [instances.aggregate]
@@ -118,3 +117,12 @@ translate = [0.0, 0.0, 0.0]
 [[instances.transform.rotate]]
 axis = [0.0, 1.0, 0.0]
 angle = -8.9
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [0.5, 0.0, 0.0]
+look_at = [0, 0, 0]
+aperture_size = 0.001
+focal_distance = 0.5
+vfov = 70.4
diff --git a/data/scenes/tower.toml b/data/scenes/tower.toml
index 97fb775..d7b9094 100644
--- a/data/scenes/tower.toml
+++ b/data/scenes/tower.toml
@@ -5,14 +5,13 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 0.7
 [environment]
-type="Sun"
+type = "Sun"
 strength = 0.1
 angular_diameter = 0.1
 sun_direction = [0.0, 1.0, 1.0]
 color = "D65"
 
 
-
 [[instances]]
 material_name = "diffuse_light"
 [instances.aggregate]
@@ -32,7 +31,7 @@ name = "tower"
 
 [[cameras]]
 type = "SimpleCamera"
-name = "tower camera"
+name = "main"
 look_from = [-3.5, -3.5, 0.0]
 look_at = [0, 0, 100]
 aperture_size = 0.01
diff --git a/data/scenes/trippy_glass_cube.toml b/data/scenes/trippy_glass_cube.toml
index 09caaf3..ff1944c 100644
--- a/data/scenes/trippy_glass_cube.toml
+++ b/data/scenes/trippy_glass_cube.toml
@@ -5,15 +5,13 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 1.0
 [environment]
-type="Sun"
+type = "Sun"
 strength = 0.01
 angular_diameter = 0.04
 sun_direction = [10.0, 0.0, 1.0]
 color = "D65"
 
 
-
-
 # [[instances]]
 # material_name = "diffuse_light"
 # [instances.aggregate]
@@ -80,3 +78,12 @@ translate = [0.0, 0.0, -0.3]
 # [[instances.transform.rotation]]
 # axis = [1, 1, 0]
 # angle = 45.0
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [0.5, 0.0, 0.0]
+look_at = [0, 0, 0]
+aperture_size = 0.001
+focal_distance = 0.5
+vfov = 70.4
diff --git a/data/scenes/white_furnace.toml b/data/scenes/white_furnace.toml
index 35ba317..d4888c5 100644
--- a/data/scenes/white_furnace.toml
+++ b/data/scenes/white_furnace.toml
@@ -5,7 +5,7 @@ meshes = "data/lib_meshes.toml"
 
 env_sampling_probability = 1.0
 [environment]
-type="Constant"
+type = "Constant"
 strength = 1.0
 [environment.color]
 type = "Flat"
@@ -19,3 +19,12 @@ material_name = "ggx_glass_rough"
 type = "Sphere"
 radius = 1.0
 origin = [0.0, 0.0, 0.0]
+
+[[cameras]]
+type = "SimpleCamera"
+name = "main"
+look_from = [0.5, 0.0, 0.0]
+look_at = [0, 0, 0]
+aperture_size = 0.001
+focal_distance = 0.5
+vfov = 70.4
diff --git a/src/camera/panorama_camera.rs b/src/camera/panorama_camera.rs
index 08c263f..6181348 100644
--- a/src/camera/panorama_camera.rs
+++ b/src/camera/panorama_camera.rs
@@ -94,7 +94,7 @@ impl Camera<f32, f32> for PanoramaCamera {
     }
     // returns None if the point on the lens was not from a valid pixel
     fn get_pixel_for_ray(&self, _ray: Ray, _lambda: f32) -> Option<(f32, f32)> {
-        // TODO
+        // TODO: implement this
         todo!()
     }
 
@@ -108,7 +108,7 @@ impl Camera<f32, f32> for PanoramaCamera {
         // pdf is projected solid angle wrt `to` point unless (from - self.origin).norm_squared() > self.radius * self.radius
         // if radius is very small, then the projected solid angle becomes very small
         // becomes a delta distribution
-        // TODO
+        // TODO: implement this
         todo!()
     }
 
diff --git a/src/parsing/cameras.rs b/src/parsing/cameras.rs
index 9d6e8c8..722cd3b 100644
--- a/src/parsing/cameras.rs
+++ b/src/parsing/cameras.rs
@@ -23,11 +23,14 @@ use super::Config;
 #[serde(tag = "type")]
 pub enum ApertureData {
     Circular,
-    // only 6 blades are supported right now.
-    // sharpness should be between -2 and 2.3
-    // 2.3 is very close to a circular aperture
-    // -2 is something like a pointy star
-    Bladed { blades: u8, sharpness: f32 },
+    /// only 6 blades are supported right now.
+    /// sharpness should be between -2 and 2.3
+    /// 2.3 is very close to a circular aperture
+    /// -2 is something like a pointy star
+    Bladed {
+        blades: u8,
+        sharpness: f32,
+    },
 }
 
 #[cfg(feature = "realistic_camera")]