Moved and tweaked some things around.