Updated comments, simple rearrangements