improve messages
remove debug
Merge branch 'master' into work