colour -> color, ellipses fixes