more improvements on spacing