some oversights fixed