fixed various spacing problems