fixed messaging and added truncation
Merge conflicts with MATT