modifying core character diff
minor bug fixes