fixed spacing in several places