removed debuggers, more template fixing