Clean up album's photo handling, fix bugs along the way.