Fixes + support for infinite arguments