Fixed the 'stop upload' error and made a couple cosmetic changes