small fixes everywhere