some fixes + simple testing