Add some new content and move a few bits around..