eta reduction, saner include directives, fixed segfault