fotter fixes and spacing fixes