more template tweaks
fixed conflict
more stats