Fixed 2 lines, added 'typename' to compile, still not tested