Fixing some problems with Manifest

Unfortunately, the data passed in from Manifest is not as consistent as
I could wish...
Got return working as a tag ending

Don't know why comma isn't working, but decided I don't care, and
removed it.