Fixed spacing and other small issues.