// improved some messages