removed template tags and fixed bad var