few fixes on output