update rendering of annotation and left-edge wave
keep info-boxes from overlapping
colour tweaks