Small changes and some moving around.