fixed the messaging issues. Appears to be working fine.
merged origin.