lots of spacing issues fixed