Added a few things - moving other things out of the way.