hopefully fixed some stupid stuff before trying over with flickr