canto-*: Some cleanup and update stuff