some defintions fixes