Add chat event mappings (and fix some errors)