Class History bugs fixed. Class HistoryEventMerge bugs fixed. Canvas updates.