small changes and manual test run script