small fixes before testing