More arranging.
Small changes...