fix return values of calls and change some text
merge master