print fixes/improvements FIX2