upgrade to 2.1.5 and tweak some messages