fixed a few more definitions