fixed a few omissions, errors