More edits + conclusion
More changes/fixes
More small fixes