again, some small fixes