inf_elements: add some more and bugfixing