better handling of upcase / title-case