small fixes more