further impl & small fixes