correcting omissions from first commit