- fixed little issue with coloring of overlapping events
- removed some buggy (and I think redundant) code