moved more template instanciations from .h to .cpp