+ small fixes