print fixes/improvements FIX