minor changes + test run