Fixed spacing issues, for the most part