+small fixes