changed: Tweaks messages a bit