Bug-fixes in the template. More data.