Added CanaryWorld, and formatted everything.