Add upgrade step
fix upload implementation
Try to handle multiple upload instances on one site