Upload + general changes