Moved things around.
Other improvements.