Fix up some URL's, further work on upload