fixed some issues with uppercase letters