Display changes
Improvements and cleanup
Merge messages and (currently non-existent) events