yet some small fixes