some fixes + load tester