removed bug in code
refixed messages