some fixes + testing