improve messages
remove debug