Again, minor updates, and spacing