Fixed up spacings and various style problems.