minor space fixes and tweaks