fixed messages
Merge branch 'mondaypart2'
merging