little modification of some case sensitive things