small fixes, testing