Working code versions

MWTools and uploader now behaving as they should.