2. fix stat/msg a bit more