add comments field, fix ship_ address handling (don't consider a value for