fixed explicit include path, some cosmetic changes to value type deduction