Message and spacing fixes