fix template and extend some sheets