Document ICharacterInput a bit more
Resolve merge issues