Update photoset, update prettyphoto, minor bug fixes