adding progress comments, reorganizing