Some minor changes... actual personal edits not yet included