fixes to messages
local caching fixes