Next spreadsheet release

* fixes to templates buggyness