joined comment and photo tables
removed some scaffolds, refactored some, comments added