Minor output changes

Output didn't always reflect what really happened.