some fixes + initial testing