fixes and more definitions