Added photos
Small tweaks for debug error catching