Moved .tpp files to more conventional .tcc files and fixed another for loop which need to be shrunk.