Moving stuff around and adding some comments