Updated template for statika-17; needs testing
Minor updates