some omissions from last commit