template & notices update & bugfix