fixes from production
updated table
new technique for finding messages
yet more fixes from production