Fix transfer, some refactoring
Change fact representation, new join function