Changed around some comments and ordering