bugfix TaskManager.java and new template files