Adjusted the content, fixed some org issues.