Important corrections + 1dan additions.