minor changes, all tests passed