More upload logging.
Some bugfixing.