fixed a few omissions