put in an upload field
merge dirk changes and fix some formatting