file upload & parsing - bug fixes