some more fixes, including an Ebel problem