Added all the minor improvements discussed in the long meeting.