change messages
remove premature optimization and 'beg'
some more fix