small changes as part of libcharacter