Improved String handling and one really weird upload bug.