'Minor' bugfixes. working on PytingoData implementation