template tags fixed, basically working