changes for lowercase and small improvements