Template reviewed & small bugs fixed.