fixed a bunch of stuff with feeds and uploads
merging