some minor corrections after test run