upper/lower case improvements