Update Character and Character AI

Fixing merge issues as well.