Change some comments. Move around some code.