fixing some wording, reorganizing, making things more clear