Many ease of use fixes