improve messages, thanks to @schodge