Last few updates of tags and uppercasings