multiple albums for upload, minor fixes