BetterPicker implementation, small fixes