#master: nicer messages