Made improvements & additions.