23 photofix

my own fixes and updates to the Photos branch, merges onto the Photos branch.

features TBA