Fix a few things, restore checks for characters, add handlers