fixing a few minor issues - allowing use of data sharing via the message model