File upload almost working. Weird error.
Fix small cosmetic changes