small fixes,the templates are finished