spacing fixes and whatnot