uploader and bot improvements