Fix #55, fix #50, sunburst update