Canto-*: Further improvements