Fixed most of the spacing issues.