fixes and opts