Added flickr support, minor bug fixes