Merged changes
Made URI multi-valued, filled in a few more fields, tested code that
fills in serial receipt.
Fixed bugs
Fixed conflicts