Lots of updates fixing templates and various issues.