Moved things around a bit.
More minor tweaks.