template parser fixes
adding fixes
adding missing data