Spaces and such.
More cleanups and balancings.