Fixed up Tamari a bit and also moved it to use supplementary content.