nasty changes to finally get photo stream working right