fixed some (but not all) of the spacing issues
fixed some (but not all) of the spacing issues