fixing the last of the template issues (I hope)