implements branching with more than two motorcycles; changes event sorting to also discriminate based on class; a little change in collapse event handling to handle concurrent branch/collapse better