corrected some omissions