Completed initial editing. That's enough for today. #3