Various changes + added set_include_path