more fixes and opts