better messages and some other fixs