moved templates around, fiddled with a few, some changes to template tags and tests