fixes model template issues
fixes spec template issues