Print + spacing fixes