minor improvements: returns, logging, de locale